From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 24 Aug 2004 17:22:33 +0000 (+0000)
Subject: * xterm.c (x_catch_errors_unwind): Do not XSync if display has closed.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~21294
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4e5665d05ecc548bcf39357f3d2115ec8ae88ae2;p=emacs.git

* xterm.c (x_catch_errors_unwind): Do not XSync if display has closed.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 654dfab042a..116bcf38688 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-24  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
+	* xterm.c (x_catch_errors_unwind): Do not XSync if display has closed.
+
 	* xfns.c (x_window_to_frame, x_any_window_to_frame)
 	(x_non_menubar_window_to_frame, x_menubar_window_to_frame)
 	(x_top_window_to_frame): Return 0 if wdesc is None.
diff --git a/src/xterm.c b/src/xterm.c
index 5e6a236c4be..c1bfd11985e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7604,11 +7604,13 @@ static Lisp_Object
 x_catch_errors_unwind (old_val)
      Lisp_Object old_val;
 {
-  Lisp_Object first;
+  Lisp_Object first = XCAR (old_val);
+  Display *dpy = XSAVE_VALUE (first)->pointer;
 
-  first = XCAR (old_val);
-
-  XSync (XSAVE_VALUE (first)->pointer, False);
+  /* The display may have been closed before this function is called.
+     Check if it is still open before calling XSync.  */
+  if (x_display_info_for_display (dpy) != 0)
+    XSync (dpy, False);
 
   x_error_message_string = XCDR (old_val);
   return Qnil;